bitkeeper revision 1.1159.1.508 (41d2c334D3CtOjd6Glhc_MnA3jjEGQ)

manual merge

diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index 64c6c8fe22dfae576cea46bb9a634a7d179e983c..fed80f1f7ef36ba5d065d35fb117b49c5abf1152 100644 (file)
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -51,6 +51,7 @@
 #include <asm/uaccess.h>
 #include <asm/i387.h>
 #include <asm/debugger.h>
+#include <asm/msr.h>
 
 /*
  * opt_nmi: one of 'ignore', 'dom0', or 'fatal'.

diff --git a/xen/common/kernel.c b/xen/common/kernel.c
index b0fbd6525ab877ea9966a14ae18cd0da4f7615bd..e8053b274c830c51a62caaaf3bd3a15a2c159773 100644 (file)
--- a/xen/common/kernel.c
+++ b/xen/common/kernel.c
@@ -41,6 +41,7 @@ integer_param("xenheap_megabytes", opt_xenheap_megabytes);
 unsigned long xenheap_phys_end;
 
 xmem_cache_t *domain_struct_cachep;
+xmem_cache_t *exec_domain_struct_cachep;
 struct domain *dom0;
 
 vm_assist_info_t vm_assist_info[MAX_VMASST_TYPE + 1];